From 35a0e28620e13e9506f41b6bc01774dc5fde3986 Mon Sep 17 00:00:00 2001 From: Alexandru Isaila Date: Thu, 5 Jul 2018 15:20:23 +0200 Subject: [PATCH] hvm/svm: enable EMUL_UNIMPLEMENTED events on svm Signed-off-by: Alexandru Isaila Acked-by: Tamas K Lengyel --- xen/include/asm-x86/monitor.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/monitor.h b/xen/include/asm-x86/monitor.h index c5a86d1109..4f1c7ffe0a 100644 --- a/xen/include/asm-x86/monitor.h +++ b/xen/include/asm-x86/monitor.h @@ -83,16 +83,11 @@ static inline uint32_t arch_monitor_get_capabilities(struct domain *d) (1U << XEN_DOMCTL_MONITOR_EVENT_INTERRUPT) | (1U << XEN_DOMCTL_MONITOR_EVENT_CPUID) | (1U << XEN_DOMCTL_MONITOR_EVENT_DEBUG_EXCEPTION) | - (1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG)); + (1U << XEN_DOMCTL_MONITOR_EVENT_WRITE_CTRLREG) | + (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED)); - if ( cpu_has_vmx ) - { - capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_EMUL_UNIMPLEMENTED); - - /* Since we know this is on VMX, we can just call the hvm func */ - if ( hvm_is_singlestep_supported() ) - capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); - } + if ( hvm_is_singlestep_supported() ) + capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_SINGLESTEP); if ( hvm_funcs.set_descriptor_access_exiting ) capabilities |= (1U << XEN_DOMCTL_MONITOR_EVENT_DESC_ACCESS); -- 2.30.2